Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 17 Jun 2011 07:37:43 +0000 (00:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 17 Jun 2011 07:37:43 +0000 (00:37 -0700)

Trivial merge